From f52d7ff283fb97c43162b9e33eb1638b1d4679c9 Mon Sep 17 00:00:00 2001
From: Martin Nordholts <martinn@src.gnome.org>
Date: Sat, 17 Jan 2009 13:33:49 +0000
Subject: [PATCH] Instead of having BABL_CLASS() plus variants and making the
 macros expand to different things depending on if they are used in a header
 or a .c file, have two versions: BABL_CLASS_DECLARE() and
 BABL_CLASS_IMPLEMENT(). This enables further refactorisations of the babl.h
 header.

* babl.h: Do the name changes and remove the unpleasant #undefs at
the bottom.

* babl-internal.h: Do the name changes.

* babl-component.[ch]
* babl-conversion.[ch]
* babl-extension.[ch]
* babl-fish.[ch]
* babl-format.[ch]
* babl-image.h
* babl-model.[ch]
* babl-sampling.h
* babl-type.[ch]: Adjust to changes.

svn path=/trunk/; revision=370
---
 ChangeLog              | 23 +++++++++++++++++++++++
 babl/babl-component.c  |  2 +-
 babl/babl-component.h  |  2 +-
 babl/babl-conversion.c |  2 +-
 babl/babl-conversion.h |  2 +-
 babl/babl-extension.c  |  2 +-
 babl/babl-extension.h  |  2 +-
 babl/babl-fish.c       |  2 +-
 babl/babl-fish.h       |  2 +-
 babl/babl-format.c     |  2 +-
 babl/babl-format.h     |  2 +-
 babl/babl-image.h      |  2 +-
 babl/babl-internal.h   |  6 +++---
 babl/babl-model.c      |  2 +-
 babl/babl-model.h      |  2 +-
 babl/babl-sampling.h   |  2 +-
 babl/babl-type.c       |  2 +-
 babl/babl-type.h       |  2 +-
 babl/babl.h            |  9 +++------
 19 files changed, 45 insertions(+), 25 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 0b71f24..13d44a6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,26 @@
+2009-01-17  Martin Nordholts  <martinn@svn.gnome.org>
+
+	Instead of having BABL_CLASS() plus variants and making the macros
+	expand to different things depending on if they are used in a
+	header or a .c file, have two versions: BABL_CLASS_DECLARE() and
+	BABL_CLASS_IMPLEMENT(). This enables further refactorisation of
+	the babl.h header.
+
+	* babl.h: Do the name changes and remove the unpleasant #undefs at
+	the bottom.
+
+	* babl-internal.h: Do the name changes.
+
+	* babl-component.[ch]
+	* babl-conversion.[ch]
+	* babl-extension.[ch]
+	* babl-fish.[ch]
+	* babl-format.[ch]
+	* babl-image.h
+	* babl-model.[ch]
+	* babl-sampling.h
+	* babl-type.[ch]: Adjust to changes.
+
 2009-01-17  Martin Nordholts  <martinn@svn.gnome.org>
 
 	Don't redeclare functions declared with the BABL_CLASS() or
diff --git a/babl/babl-component.c b/babl/babl-component.c
index 4c84bba..45a9b0a 100644
--- a/babl/babl-component.c
+++ b/babl/babl-component.c
@@ -127,4 +127,4 @@ babl_component_new (void *first_arg,
   return babl;
 }
 
-BABL_CLASS (component)
+BABL_CLASS_IMPLEMENT (component)
diff --git a/babl/babl-component.h b/babl/babl-component.h
index 6cfae07..98dadc5 100644
--- a/babl/babl-component.h
+++ b/babl/babl-component.h
@@ -23,7 +23,7 @@
 
 /****************************************************************/
 /* BablComponent */
-BABL_NAMED_CLASS (component);
+BABL_NAMED_CLASS_DECLARE (component);
 /*
  * Babl * babl_component_new (const char *name,
  *                            NULL);
diff --git a/babl/babl-conversion.c b/babl/babl-conversion.c
index 7c028b5..173cdf3 100644
--- a/babl/babl-conversion.c
+++ b/babl/babl-conversion.c
@@ -555,4 +555,4 @@ babl_conversion_error (BablConversion *conversion)
   return error;
 }
 
-BABL_CLASS (conversion)
+BABL_CLASS_IMPLEMENT (conversion)
diff --git a/babl/babl-conversion.h b/babl/babl-conversion.h
index d5d609f..8b0ca8a 100644
--- a/babl/babl-conversion.h
+++ b/babl/babl-conversion.h
@@ -22,7 +22,7 @@
 
 /****************************************************************/
 /* BablConversion */
-BABL_NAMED_CLASS (conversion);
+BABL_NAMED_CLASS_DECLARE (conversion);
 /*
  * Babl * babl_conversion_new (<BablFormat *source, BablFormat *destination|
  *                              BablModel  *source, BablModel  *destination|
diff --git a/babl/babl-extension.c b/babl/babl-extension.c
index 921f7f4..e8866ac 100644
--- a/babl/babl-extension.c
+++ b/babl/babl-extension.c
@@ -357,4 +357,4 @@ each_babl_extension_destroy (Babl *babl,
   return 0;  /* continue iterating */
 }
 
-BABL_CLASS (extension)
+BABL_CLASS_IMPLEMENT (extension)
diff --git a/babl/babl-extension.h b/babl/babl-extension.h
index 723198b..6cba1e9 100644
--- a/babl/babl-extension.h
+++ b/babl/babl-extension.h
@@ -22,7 +22,7 @@
 
 /****************************************************************/
 /* BablExtension */
-BABL_NAMED_CLASS (extension);
+BABL_NAMED_CLASS_DECLARE (extension);
 /*
  * BablExtension objects are only used internally in babl.
  */
diff --git a/babl/babl-fish.c b/babl/babl-fish.c
index 8d7c37e..a7b5cf7 100644
--- a/babl/babl-fish.c
+++ b/babl/babl-fish.c
@@ -335,4 +335,4 @@ each_babl_fish_destroy (Babl *babl,
   return 0;  /* continue iterating */
 }
 
-BABL_CLASS_MINIMAL (fish);
+BABL_CLASS_MINIMAL_IMPLEMENT (fish);
diff --git a/babl/babl-fish.h b/babl/babl-fish.h
index 938d43b..1333366 100644
--- a/babl/babl-fish.h
+++ b/babl/babl-fish.h
@@ -22,7 +22,7 @@
 
 /****************************************************************/
 /* BablFish */
-BABL_CLASS (fish);
+BABL_CLASS_DECLARE (fish);
 /*  Create a babl fish capable of converting from source_format to
  *  destination_format, source and destination can be
  *  either strings with the names of the formats or BablFormat objects.
diff --git a/babl/babl-format.c b/babl/babl-format.c
index bc080c6..2696dd0 100644
--- a/babl/babl-format.c
+++ b/babl/babl-format.c
@@ -436,4 +436,4 @@ babl_format_loss (Babl *babl)
   return loss;
 }
 
-BABL_CLASS (format)
+BABL_CLASS_IMPLEMENT (format)
diff --git a/babl/babl-format.h b/babl/babl-format.h
index d8cb04d..d584f72 100644
--- a/babl/babl-format.h
+++ b/babl/babl-format.h
@@ -22,7 +22,7 @@
 
 /****************************************************************/
 /* BablFormat */
-BABL_NAMED_CLASS (format);
+BABL_NAMED_CLASS_DECLARE (format);
 /*
  * Babl * babl_format_new (["name", const char *name,]
  *                          BablModel          *model,
diff --git a/babl/babl-image.h b/babl/babl-image.h
index 8d4fc6e..52769ff 100644
--- a/babl/babl-image.h
+++ b/babl/babl-image.h
@@ -22,7 +22,7 @@
 
 /****************************************************************/
 /* BablImage */
-BABL_CLASS (image);
+BABL_CLASS_DECLARE (image);
 /*
  * Babl images can be used for planar buffers instead of linear buffers for
  * babl_process(), BablImages are still experimental, for now BablImages can be
diff --git a/babl/babl-internal.h b/babl/babl-internal.h
index 4a3422a..7275fcb 100644
--- a/babl/babl-internal.h
+++ b/babl/babl-internal.h
@@ -209,7 +209,7 @@ void         babl_internal_destroy (void);
  * to be kept in sync with the C files.
  */
 
-#define BABL_CLASS_MINIMAL(klass)                             \
+#define BABL_CLASS_MINIMAL_IMPLEMENT(klass)                   \
 void                                                          \
 babl_##klass##_init (void)                                    \
 {                                                             \
@@ -235,8 +235,8 @@ babl_##klass##_each (BablEachFunction  each_fun,              \
   babl_db_each (db, each_fun, user_data);                     \
 }                                                             \
 
-#define BABL_CLASS(klass)                                     \
-BABL_CLASS_MINIMAL(klass)                                     \
+#define BABL_CLASS_IMPLEMENT(klass)                           \
+BABL_CLASS_MINIMAL_IMPLEMENT(klass)                           \
                                                               \
 Babl *                                                        \
 babl_##klass (const char *name)                               \
diff --git a/babl/babl-model.c b/babl/babl-model.c
index 5fd4908..e7e59ca 100644
--- a/babl/babl-model.c
+++ b/babl/babl-model.c
@@ -327,4 +327,4 @@ babl_model_is_symmetric (Babl *babl)
   return symmetric;
 }
 
-BABL_CLASS (model)
+BABL_CLASS_IMPLEMENT (model)
diff --git a/babl/babl-model.h b/babl/babl-model.h
index ec2dd65..494f4b6 100644
--- a/babl/babl-model.h
+++ b/babl/babl-model.h
@@ -22,7 +22,7 @@
 
 /****************************************************************/
 /* BablModel */
-BABL_NAMED_CLASS (model);
+BABL_NAMED_CLASS_DECLARE (model);
 /*
  * Babl * babl_model_new (["name", const char *name,]
  *                        BablComponent *component1,
diff --git a/babl/babl-sampling.h b/babl/babl-sampling.h
index 0e772d1..4b67470 100644
--- a/babl/babl-sampling.h
+++ b/babl/babl-sampling.h
@@ -22,7 +22,7 @@
 
 /****************************************************************/
 /* BablSampling */
-BABL_CLASS (sampling);
+BABL_CLASS_DECLARE (sampling);
 /**/
 Babl * babl_sampling       (int horizontal,
                             int vertical);
diff --git a/babl/babl-type.c b/babl/babl-type.c
index 399d831..a1537ac 100644
--- a/babl/babl-type.c
+++ b/babl/babl-type.c
@@ -252,4 +252,4 @@ babl_type_is_symmetric (Babl *babl)
   return is_symmetrical;
 }
 
-BABL_CLASS (type)
+BABL_CLASS_IMPLEMENT (type)
diff --git a/babl/babl-type.h b/babl/babl-type.h
index dd4857f..ec3662c 100644
--- a/babl/babl-type.h
+++ b/babl/babl-type.h
@@ -22,7 +22,7 @@
 
 /****************************************************************/
 /* BablType */
-BABL_NAMED_CLASS (type);
+BABL_NAMED_CLASS_DECLARE (type);
 /*
  * A data type that babl can have in it's buffers, requires
  * conversions to and from "double" to be registered before
diff --git a/babl/babl.h b/babl/babl.h
index a1e99a1..8283db3 100644
--- a/babl/babl.h
+++ b/babl/babl.h
@@ -84,7 +84,7 @@ typedef int  (*BablEachFunction) (Babl *entry,
  * to be iterated over, common functionality is defined through these
  * macros.
  */
-#define BABL_CLASS(klass)                                    \
+#define BABL_CLASS_DECLARE(klass)                            \
                                                              \
 void   babl_##klass##_init    (void);                        \
 void   babl_##klass##_destroy (void);                        \
@@ -98,9 +98,9 @@ void   babl_##klass##_each    (BablEachFunction  each_fun,   \
  * the means to lookup by name, as well as to create new named objects
  * that later can be looked up.
  */
-#define BABL_NAMED_CLASS(klass)                              \
+#define BABL_NAMED_CLASS_DECLARE(klass)                      \
                                                              \
-BABL_CLASS (klass);                                          \
+BABL_CLASS_DECLARE (klass);                                  \
 Babl * babl_##klass           (const char       *name);      \
 Babl * babl_##klass##_new     (void             *first_arg,  \
                                ...) BABL_ARG_NULL_TERMINATED
@@ -163,7 +163,4 @@ typedef union _Babl
   BablExtension     extension;
 } _Babl;
 
-#undef BABL_CLASS
-#undef BABL_NAMED_CLASS
-
 #endif
-- 
2.30.2